bcr: Change handling of DESCRIPTION lines. Regenerate reference files.

diff --git a/bcr.c b/bcr.c
index 4d0ad1318ac92c63b76942e4f2e723a3c94a6683..c9eaf340eab737ea7f1b19017372cd4ffa098b63 100644 (file)
--- a/bcr.c
+++ b/bcr.c
@@ -431,7 +431,10 @@ bcr_route_header(const route_head *route)
                if (s2 == NULL) s2 = xstrdup("");
                else s2 = csv_stringclean(s2, ",\t\r\n");
                
-               xasprintf(&sout, "%s,%s,,0", s1, s2);
+               if (*s2)
+                       xasprintf(&sout, "%s,%s,@,0", s1, s2);
+               else
+                       xasprintf(&sout, "%s,%s,@,0", s1, s1);
                bcr_write_line(fout, "STATION", &i, sout);
                
                xfree(s1);

diff --git a/reference/route/bcr-sample2.bcr b/reference/route/bcr-sample2.bcr
index a630c391660cb06eb2eb3d14a77e677c1bff6b31..88f13cba29cce8273dc8c7ec1621f38d0be2b022 100644 (file)
--- a/reference/route/bcr-sample2.bcr
+++ b/reference/route/bcr-sample2.bcr
@@ -22,14 +22,14 @@ STATION7=1389101,6644184
 STATION8=1377578,6656081\r
 STATION9=1379831,6669676\r
 [DESCRIPTION]\r
-STATION1=bei D 08527,Neundorf,,0\r
-STATION2=bei D 08523,Plauen/Possig,,0\r
-STATION3=bei D 08523,Plauen/Westend,,0\r
-STATION4=bei D 08427,Fraureuth/Beiersdorf,,0\r
-STATION5=bei D 04639,Ponitz/Merlach,,0\r
-STATION6=bei D 04600,Altenburg/Paditz,,0\r
-STATION7=bei D 04552,Borna/Gestewitz,,0\r
-STATION8=bei D 04564,Boehlen/Grossdeuben,,0\r
-STATION9=bei D 04317,Leipzig/Thonberg,,0\r
+STATION1=bei D 08527,Neundorf,@,0\r
+STATION2=bei D 08523,Plauen/Possig,@,0\r
+STATION3=bei D 08523,Plauen/Westend,@,0\r
+STATION4=bei D 08427,Fraureuth/Beiersdorf,@,0\r
+STATION5=bei D 04639,Ponitz/Merlach,@,0\r
+STATION6=bei D 04600,Altenburg/Paditz,@,0\r
+STATION7=bei D 04552,Borna/Gestewitz,@,0\r
+STATION8=bei D 04564,Boehlen/Grossdeuben,@,0\r
+STATION9=bei D 04317,Leipzig/Thonberg,@,0\r
 [ROUTE]\r
 ROUTERECT=1346067,6669676,1389101,6524736\r